From b71609e23e6fab27e0da4d4560179c6d6414e773 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 23 Jan 2009 05:43:45 +0000 Subject: [PATCH] Improve docs svn path=/trunk/; revision=22188 --- ChangeLog | 7 +++++++ gtk/gtkimage.c | 20 ++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2102041298..e475be5891 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-01-23 Matthias Clasen + + Bug 567021 – gtkimage accessors docs + + * gtk/gtkimage.c: Improve docs by mentioning allowed NULL values. + Patch by Christian Persch + 2009-01-23 Matthias Clasen Bug 566535 – gtk_widget_get_snapshot does not work if double buffered diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c index 15f3bb27d9..036560f377 100644 --- a/gtk/gtkimage.c +++ b/gtk/gtkimage.c @@ -1200,8 +1200,8 @@ gtk_image_get_pixmap (GtkImage *image, /** * gtk_image_get_image: * @image: a #GtkImage - * @gdk_image: return location for a #GtkImage - * @mask: return location for a #GdkBitmap + * @gdk_image: return location for a #GtkImage, or %NULL + * @mask: return location for a #GdkBitmap, or %NULL * * Gets the #GdkImage and mask being displayed by the #GtkImage. * The storage type of the image must be %GTK_IMAGE_EMPTY or @@ -1253,8 +1253,8 @@ gtk_image_get_pixbuf (GtkImage *image) /** * gtk_image_get_stock: * @image: a #GtkImage - * @stock_id: place to store a stock icon name - * @size: place to store a stock icon size + * @stock_id: place to store a stock icon name, or %NULL + * @size: place to store a stock icon size, or %NULL * * Gets the stock icon name and size being displayed by the #GtkImage. * The storage type of the image must be %GTK_IMAGE_EMPTY or @@ -1284,8 +1284,8 @@ gtk_image_get_stock (GtkImage *image, /** * gtk_image_get_icon_set: * @image: a #GtkImage - * @icon_set: location to store a #GtkIconSet - * @size: location to store a stock icon size + * @icon_set: location to store a #GtkIconSet, or %NULL + * @size: location to store a stock icon size, or %NULL * * Gets the icon set and size being displayed by the #GtkImage. * The storage type of the image must be %GTK_IMAGE_EMPTY or @@ -1336,8 +1336,8 @@ gtk_image_get_animation (GtkImage *image) /** * gtk_image_get_icon_name: * @image: a #GtkImage - * @icon_name: place to store an icon name - * @size: place to store an icon size + * @icon_name: place to store an icon name, or %NULL + * @size: place to store an icon size, or %NULL * * Gets the icon name and size being displayed by the #GtkImage. * The storage type of the image must be %GTK_IMAGE_EMPTY or @@ -1369,8 +1369,8 @@ gtk_image_get_icon_name (GtkImage *image, /** * gtk_image_get_gicon: * @image: a #GtkImage - * @gicon: place to store a #GIcon - * @size: place to store an icon size + * @gicon: place to store a #GIcon, or %NULL + * @size: place to store an icon size, or %NULL * * Gets the #GIcon and size being displayed by the #GtkImage. * The storage type of the image must be %GTK_IMAGE_EMPTY or -- 2.30.2